Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 May 2011 03:53:56 +0000 (20:53 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 29 May 2011 03:53:56 +0000 (20:53 -0700)
commit38069623eba00b61e379105910c180c431bb7e23
treeb3f308d83277f50363f777e227b112369b28a3eb
parent058404f07323ae929b55c4c31324248138d83b23
parentd69448e9b31ce28cff9a1cdcb22c3618a4b43202
Merge from trunk.